Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 22 Nov 2011 17:09:12 +0000 (17:09 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 22 Nov 2011 17:09:12 +0000 (17:09 +0000)

Trivial merge